Drop gtk_window_begin_move/resize_drag

These are just simple wrappers around GdkSurface
api, and we don't need them.

diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 2f6b536499a4d089002c4e33141ca30253d7c950..f598e905ee45a6ee77bd6507ab943774f1451cbc 100644 (file)
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -6685,11 +6685,12 @@ move_window_clicked (GtkModelButton *button,
                      gpointer        user_data)
 {
   GtkWindow *window = GTK_WINDOW (user_data);
+  GtkWindowPrivate *priv = gtk_window_get_instance_private (window);
 
-  gtk_window_begin_move_drag (window,
-                              0, /* 0 means "use keyboard" */
-                              0, 0,
-                              GDK_CURRENT_TIME);
+  gdk_surface_begin_move_drag (priv->surface,
+                               0, /* 0 means "use keyboard" */
+                               0, 0,
+                               GDK_CURRENT_TIME);
 }
 
 static void
@@ -6697,8 +6698,9 @@ resize_window_clicked (GtkModelButton *button,
                        gpointer        user_data)
 {
   GtkWindow *window = GTK_WINDOW (user_data);
+  GtkWindowPrivate *priv = gtk_window_get_instance_private (window);
 
-  gtk_window_begin_resize_drag  (window,
+  gdk_surface_begin_resize_drag (priv->surface,
                                  0,
                                  0, /* 0 means "use keyboard" */
                                  0, 0,
@@ -8068,60 +8070,6 @@ gtk_window_get_resizable (GtkWindow *window)
   return priv->resizable;
 }
 
-/**
- * gtk_window_begin_resize_drag:
- * @window: a #GtkWindow
- * @button: mouse button that initiated the drag
- * @edge: position of the resize control
- * @x: X position where the user clicked to initiate the drag, in window coordinates
- * @y: Y position where the user clicked to initiate the drag
- * @timestamp: timestamp from the click event that initiated the drag
- *
- * Starts resizing a window. This function is used if an application
- * has window resizing controls.
- */
-void
-gtk_window_begin_resize_drag (GtkWindow      *window,
-                              GdkSurfaceEdge  edge,
-                              gint            button,
-                              gint            x,
-                              gint            y,
-                              guint32         timestamp)
-{
-  GtkWindowPrivate *priv = gtk_window_get_instance_private (window);
-
-  g_return_if_fail (GTK_IS_WINDOW (window));
-  g_return_if_fail (gtk_widget_get_visible (GTK_WIDGET (window)));
-
-  gdk_surface_begin_resize_drag (priv->surface, edge, button, x, y, timestamp);
-}
-
-/**
- * gtk_window_begin_move_drag:
- * @window: a #GtkWindow
- * @button: mouse button that initiated the drag
- * @x: X position where the user clicked to initiate the drag, in window coordinates
- * @y: Y position where the user clicked to initiate the drag
- * @timestamp: timestamp from the click event that initiated the drag
- *
- * Starts moving a window. This function is used if an application has
- * window movement grips.
- */
-void
-gtk_window_begin_move_drag (GtkWindow *window,
-                            gint       button,
-                            gint       x,
-                            gint       y,
-                            guint32    timestamp)
-{
-  GtkWindowPrivate *priv = gtk_window_get_instance_private (window);
-
-  g_return_if_fail (GTK_IS_WINDOW (window));
-  g_return_if_fail (gtk_widget_get_visible (GTK_WIDGET (window)));
-
-  gdk_surface_begin_move_drag (priv->surface, button, x, y, timestamp);
-}
-
 /**
  * gtk_window_set_display:
  * @window: a #GtkWindow.

diff --git a/gtk/gtkwindow.h b/gtk/gtkwindow.h
index a9274bbaac4eb71e5e9c1a827a9466279facfce8..78ff464b82c0db43ce96f82fc6aa7378ccb557ac 100644 (file)
--- a/gtk/gtkwindow.h
+++ b/gtk/gtkwindow.h
@@ -266,20 +266,6 @@ void     gtk_window_set_keep_above    (GtkWindow *window, gboolean setting);
 GDK_AVAILABLE_IN_ALL
 void     gtk_window_set_keep_below    (GtkWindow *window, gboolean setting);
 
-GDK_AVAILABLE_IN_ALL
-void gtk_window_begin_resize_drag (GtkWindow     *window,
-                                   GdkSurfaceEdge  edge,
-                                   gint           button,
-                                   gint           x,
-                                   gint           y,
-                                   guint32        timestamp);
-GDK_AVAILABLE_IN_ALL
-void gtk_window_begin_move_drag   (GtkWindow     *window,
-                                   gint           button,
-                                   gint           x,
-                                   gint           y,
-                                   guint32        timestamp);
-
 /* Set initial default size of the window (does not constrain user
  * resize operations)
  */